Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 18:18:38 +0000 (11:18 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 18:18:38 +0000 (11:18 -0700)
commit3670e3be8b2ba546f15bb92314505080c2a20f9e
treec699bffd1f96fe28508854dda0dca58ba7932920
parente4ecbae90e4f3b025fe0cbed023705c8616bf0ce
parent6192944e4b8ef84a2f7fa0d0eefc90abb0aaf2ab
Merge from trunk.